middleware/adaptor/adaptor_test.go (3)

704-716: Use test logging instead of printing to stdout.

Replace fmt.Println with t.Logf to keep test output clean.

 	// Read response
 	buf := make([]byte, 1024)
 	n, err := conn.Read(buf)
 	if err != nil {
 		listener.Close()
 		t.Fatal(err)
 	}
 
 	rawResponse := string(buf[:n])
-	fmt.Println("Raw response:\n", rawResponse)
+	t.Logf("Raw response:\n%s", rawResponse)

---

695-702: Consider a bounded dial to avoid hangs.

Use net.DialTimeout with a short timeout to prevent a stuck read if the server doesn’t accept in time.

Example:

conn, err := net.DialTimeout("unix", socketPath, 2*time.Second)

Requires: import "time"

---

717-721: Assert status code too, not only body substring.

A quick check avoids false positives if body changes.

if !strings.HasPrefix(rawResponse, "HTTP/1.1 200") {
	t.Fatalf("unexpected status line: %q", rawResponse)
}

middleware/adaptor/adaptor.go (1)

171-179: Solid Unix-socket fallback; simplify and avoid err shadowing.

Current logic is correct. You can simplify and make the intent clearer by using net.Addr directly and a separate tcpErr variable.

Please confirm fasthttp.RequestCtx.Init tolerates a nil remoteAddr across the supported fasthttp versions in this repo.

-		// Determine remoteAddr for TCP or fallback for Unix sockets
-		var remoteAddr *net.TCPAddr
-		tcpAddr, err := net.ResolveTCPAddr("tcp", r.RemoteAddr)
-		if err != nil {
-			// Unix socket or invalid address
-			remoteAddr = nil // fasthttp will handle nil correctly
-		} else {
-			remoteAddr = tcpAddr
-		}
+		// Determine remoteAddr for TCP or fallback for Unix sockets
+		var remoteAddr net.Addr // nil => fasthttp handles it
+		if addr, tcpErr := net.ResolveTCPAddr("tcp", r.RemoteAddr); tcpErr == nil {
+			remoteAddr = addr
+		}

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Learnt from: gaby
PR: gofiber/fiber#3193
File: middleware/adaptor/adaptor.go:111-111
Timestamp: 2024-11-10T23:44:13.704Z
Learning: In the `middleware/adaptor/adaptor.go` file of the Fiber framework, when updating context handling, replacing `c.Context()` with `c.RequestCtx()` is appropriate to access the `fasthttp.RequestCtx`.

middleware/adaptor/adaptor_test.go (2)

699-705: Guarantee server shutdown even on early failures via t.Cleanup.

This makes teardown robust and avoids relying on manual closes sprinkled across error paths.

Apply this diff:

 done := make(chan struct{})
 go func() {
   if err := http.Serve(listener, handler); err != nil && err != http.ErrServerClosed {
     t.Errorf("http.Serve failed: %v", err)
   }
   close(done)
 }()
+ t.Cleanup(func() {
+   _ = listener.Close()
+   <-done
+ })

Optional: once this is added, you can remove the explicit listener.Close() and <-done at Lines 744-746.

---

707-718: Set a connection deadline to prevent hangs/flakes.

Without a deadline, a stalled read/write can hang the test. Add a short deadline.

Apply this diff:

 conn, err := net.Dial("unix", socketPath)
 if err != nil {
   if err := listener.Close(); err != nil {
     t.Errorf("listener.Close failed: %v", err)
   }
   t.Fatal(err)
 }
 defer func() {
   if err := conn.Close(); err != nil {
     t.Errorf("conn.Close failed: %v", err)
   }
 }()
+ // avoid indefinite hangs on read/write
+ require.NoError(t, conn.SetDeadline(time.Now().Add(5*time.Second)))

And add the missing import:

 import (
   "bytes"
   "context"
   "fmt"
   "io"
   "net"
   "net/http"
   "net/http/httptest"
   "net/url"
   "os"
   "path/filepath"
   "runtime"
+  "time"
   "strings"
   "testing"

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

middleware/adaptor/adaptor.go (2)

142-149: Solid Unix-network detection; one-line simplification possible

The switch works. Tiny nit: a single return reads cleaner.

-func isUnixNetwork(network string) bool {
-	switch network {
-		case "unix", "unixgram", "unixpacket":
-			return true
-		default:
-			return false
-	}
-}
+func isUnixNetwork(network string) bool {
+	return network == "unix" || network == "unixgram" || network == "unixpacket"
+}

---

152-156: Avoid re-parsing Unix addrs; return the existing addr

If LocalAddrContextKey is a Unix addr, you can return it directly instead of creating a new one from String(); this avoids odd “unix:…” names and unnecessary work.

-func resolveRemoteAddr(remoteAddr string, localAddr any) (net.Addr, error) {
-	if addr, ok := localAddr.(net.Addr); ok && isUnixNetwork(addr.Network()) {
-		return net.ResolveUnixAddr("unix", addr.String())
-	}
+func resolveRemoteAddr(remoteAddr string, localAddr any) (net.Addr, error) {
+	if addr, ok := localAddr.(net.Addr); ok && isUnixNetwork(addr.Network()) {
+		// Pass through the Unix addr as-is.
+		return addr, nil
+	}

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Learnt from: gaby
PR: gofiber/fiber#3193
File: middleware/adaptor/adaptor.go:111-111
Timestamp: 2024-11-10T23:44:13.704Z
Learning: In the `middleware/adaptor/adaptor.go` file of the Fiber framework, when updating context handling, replacing `c.Context()` with `c.RequestCtx()` is appropriate to access the `fasthttp.RequestCtx`.